From ee88148c8b83cb4192abf6068ecde98a4500769b Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Thu, 20 Sep 2018 22:43:47 +0100
Subject: [PATCH] cppunit-optional

Gbp-Pq: Name cppunit-optional.diff
---
 config_host.mk.in             |   1 +
 configure.ac                  | Bin 458980 -> 459241 bytes
 sal/Module_sal.mk             |   7 ++++++-
 sdext/Executable_pdf2xml.mk   |  12 ++++++++++--
 smoketest/Module_smoketest.mk |   4 ++++
 test/Module_test.mk           |   2 ++
 testtools/Module_testtools.mk |   4 ++++
 unotest/Module_unotest.mk     |   3 +++
 8 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/config_host.mk.in b/config_host.mk.in
index aa9bfb57633..1fa27229e85 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -119,6 +119,7 @@ export ENABLE_COINMP=@ENABLE_COINMP@
 export SYSTEM_COINMP=@SYSTEM_COINMP@
 export COINMP_CFLAGS=@COINMP_CFLAGS@
 export COINMP_LIBS=@COINMP_LIBS@
+export ENABLE_CPPUNIT=@ENABLE_CPPUNIT@
 export ENABLE_CUPS=@ENABLE_CUPS@
 export ENABLE_CURL=@ENABLE_CURL@
 export ENABLE_FUZZERS=@ENABLE_FUZZERS@
diff --git a/configure.ac b/configure.ac
index e8ef251ae9d2961ee54e90c563d6e5768e244e81..4f3f49cf031322873b54c0a9b1ed5ec08a3df87e 100644
GIT binary patch
delta 254
zcmaFTDD$#ereO;sixhiuK|yI=X36wIMn;*e{L&I#sDNFp4wnKHM5kmHCnn{jDkPO=
z=A>lirE4f^D&(grK$R*Kmz1WZDJ13;=Yv(0D5R7Y0aYpFCT2tR#A@nr>6B-dWW+=D
zOlDjn+WudX5r~<9n0fnuNftRhq0BUelGNf71tk@j;_3D^Y!cJg8nJOte|L<9f4Zdy
zi-rWqU9NtPPCl;j&H(|Tex4z=Awi+8T+<6mm?YStLem*5nFFRTn83>0zTbldh*`Jq
J_h3`q0RUaeRpI~u

delta 68
zcmaFaEc2vMreO;si&Xn+DMlb>0%GRvtEE^Z^`<*HG0RNn@MO`LzF2}aY`VfsR*vcE
UUM!;RH$7Q^n05P2Pd0%a034ha$p8QV

diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 745339944bc..68d79f599ca 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -10,7 +10,6 @@
 $(eval $(call gb_Module_Module,sal))
 
 $(eval $(call gb_Module_add_targets,sal,\
-	$(if $(CROSS_COMPILING),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,Executable_cppunittester)) \
 	$(if $(filter $(OS),ANDROID), \
 		Library_lo-bootstrap) \
 	Library_sal \
@@ -33,4 +32,10 @@ $(eval $(call gb_Module_add_check_targets,sal,\
 
 endif
 
+ifeq ($(ENABLE_CPPUNIT),TRUE)
+$(eval $(call gb_Module_add_check_targets,sal,\
+	$(if $(CROSS_COMPILING),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,Executable_cppunittester)) \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/sdext/Executable_pdf2xml.mk b/sdext/Executable_pdf2xml.mk
index c0f7fe6f572..2a84a7d632e 100644
--- a/sdext/Executable_pdf2xml.mk
+++ b/sdext/Executable_pdf2xml.mk
@@ -13,10 +13,10 @@ $(eval $(call gb_Executable_use_sdk_api,pdf2xml))
 
 $(eval $(call gb_Executable_use_externals,pdf2xml,\
     boost_headers \
-    cppunit \
     zlib \
 ))
 
+
 $(eval $(call gb_Executable_set_include,pdf2xml,\
     -I$(SRCDIR)/sdext/source/pdfimport/inc \
     $$(INCLUDE) \
@@ -27,12 +27,20 @@ $(eval $(call gb_Executable_use_libraries,pdf2xml,\
     vcl \
     comphelper \
     cppu \
-    unotest \
     cppuhelper \
     sal \
     xo \
 ))
 
+ifeq ($(ENABLE_CPPUNIT),TRUE)
+$(eval $(call gb_Executable_use_externals,pdf2xml,\
+    cppunit \
+))
+$(eval $(call gb_Executable_use_libraries,pdf2xml,\
+    unotest \
+))
+endif
+
 $(eval $(call gb_Executable_use_library_objects,pdf2xml,pdfimport))
 
 $(eval $(call gb_Executable_add_exception_objects,pdf2xml,\
diff --git a/smoketest/Module_smoketest.mk b/smoketest/Module_smoketest.mk
index 7e8b6d5f11f..a084e254bf7 100644
--- a/smoketest/Module_smoketest.mk
+++ b/smoketest/Module_smoketest.mk
@@ -12,6 +12,8 @@ $(eval $(call gb_Module_Module,smoketest))
 
 ifeq ($(CROSS_COMPILING),)
 
+ifeq ($(ENABLE_CPPUNIT),TRUE)
+
 $(eval $(call gb_Module_add_targets,smoketest,\
 	Library_smoketest \
 	Zip_smoketestdoc \
@@ -42,6 +44,8 @@ endif
 
 endif
 
+endif
+
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,smoketest,\
 	Jar_smoketest \
diff --git a/test/Module_test.mk b/test/Module_test.mk
index e1051f16b5a..d1787cb5789 100644
--- a/test/Module_test.mk
+++ b/test/Module_test.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,test))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 
+ifeq ($(ENABLE_CPPUNIT),TRUE)
 $(eval $(call gb_Module_add_targets,test,\
     Library_test \
     Library_test_setupvcl \
@@ -18,6 +19,7 @@ $(eval $(call gb_Module_add_targets,test,\
     Library_vclbootstrapprotector \
     Package_unittest \
 ))
+endif
 
 endif
 
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index a1b84e175b3..08e4aad24c1 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_Module_Module,testtools))
 
 ifeq ($(CROSS_COMPILING),)
 
+ifeq ($(ENABLE_CPPUNIT),TRUE)
+
 $(eval $(call gb_Module_add_targets,testtools,\
 	CustomTarget_bridgetest \
 	InternalUnoApi_bridgetest \
@@ -41,4 +43,6 @@ $(eval $(call gb_Module_add_check_targets,testtools,\
 
 endif
 
+endif
+
 # vim:set noet sw=4 ts=4:
diff --git a/unotest/Module_unotest.mk b/unotest/Module_unotest.mk
index a47ca5d4b69..e243e06309f 100644
--- a/unotest/Module_unotest.mk
+++ b/unotest/Module_unotest.mk
@@ -11,12 +11,15 @@
 $(eval $(call gb_Module_Module,unotest))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
+
+ifeq ($(ENABLE_CPPUNIT),TRUE)
 $(eval $(call gb_Module_add_targets,unotest,\
 	Library_unobootstrapprotector \
 	Library_unoexceptionprotector \
 	Library_unotest \
 ))
 endif
+endif
 
 ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,unotest,\
-- 
2.30.2